From 5263820007b7c656aa31c59ded45dc6865d5eb01 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Fri, 16 Mar 2012 19:22:46 +0200 Subject: [PATCH] Fltk and Qt related build failure --- CMakeLists.txt | 8 ++++---- debian/changelog | 6 ++++++ debian/patches/CMakeLists-txt.patch | 21 +++++++++++---------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9f8cf0..1a39bdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,13 +17,13 @@ option(enable-hdf4 "Enable hdf4 support" ON) option(enable-hdf5 "Enable hdf5 1.6 support") option(enable-hdf5_18 "Enable hdf5 1.8 support" ON) option(enable-opengl "Enable OpenGL support" ON) -option(enable-glut "Enable glut support") -option(enable-fltk "Enable fltk widget" ON) +option(enable-glut "Enable glut support" ON) +option(enable-fltk "Enable fltk widget") option(enable-wx "Enable wxWidget widget" ON) -option(enable-qt "Enable Qt4 widget" ON) +option(enable-qt "Enable Qt4 widget") option(enable-python "Enable python interface" ON) option(enable-octave "Enable octave interface" ON) -option(enable-doc "Enable documentation building") +option(enable-doc "Enable documentation building" ON) include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) diff --git a/debian/changelog b/debian/changelog index 84982fa..c39061e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mathgl (2~rc2+svn367-1) experimental; urgency=low + + * Updated source from svn repository. + + -- Dimitrios Eftaxiopoulos Fri, 16 Mar 2012 15:27:00 +0200 + mathgl (2~rc2+svn364-1) experimental; urgency=low * Updated source from svn repository. diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch index 9df72d4..394df6d 100644 --- a/debian/patches/CMakeLists-txt.patch +++ b/debian/patches/CMakeLists-txt.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2,27 +2,27 @@ +@@ -2,28 +2,28 @@ project( MathGL ) set(CMAKE_VERBOSE_MAKEFILE ON) @@ -28,17 +28,18 @@ -option(enable-hdf5_18 "Enable hdf5 1.8 support") +option(enable-hdf5_18 "Enable hdf5 1.8 support" ON) option(enable-opengl "Enable OpenGL support" ON) - option(enable-glut "Enable glut support") --option(enable-fltk "Enable fltk widget") +-option(enable-glut "Enable glut support") ++option(enable-glut "Enable glut support" ON) + option(enable-fltk "Enable fltk widget") -option(enable-wx "Enable wxWidget widget") --option(enable-qt "Enable Qt4 widget") ++option(enable-wx "Enable wxWidget widget" ON) + option(enable-qt "Enable Qt4 widget") -option(enable-python "Enable python interface") -option(enable-octave "Enable octave interface") -+option(enable-fltk "Enable fltk widget" ON) -+option(enable-wx "Enable wxWidget widget" ON) -+option(enable-qt "Enable Qt4 widget" ON) +-option(enable-doc "Enable documentation building") +option(enable-python "Enable python interface" ON) +option(enable-octave "Enable octave interface" ON) - option(enable-doc "Enable documentation building") - if(enable-double) - set(use_double 1) ++option(enable-doc "Enable documentation building" ON) + + include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) + -- 2.30.2